From a620a1d688958fc1f5522e03920a98e825bc4d7a Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 8 Feb 2016 02:26:07 +0100 Subject: [PATCH] win32: Remove unused functions / header includes --- gtk/deprecated/gtkstyleproperties.c | 1 - gtk/gtkcssstylepropertyimpl.c | 1 - gtk/gtksettings.c | 4 ---- gtk/gtkwin32theme.c | 12 ------------ gtk/gtkwin32themeprivate.h | 1 - 5 files changed, 19 deletions(-) diff --git a/gtk/deprecated/gtkstyleproperties.c b/gtk/deprecated/gtkstyleproperties.c index 7e0cc3858f..c132329300 100644 --- a/gtk/deprecated/gtkstyleproperties.c +++ b/gtk/deprecated/gtkstyleproperties.c @@ -32,7 +32,6 @@ #include "gtkstylepropertyprivate.h" #include "gtkstyleproviderprivate.h" #include "gtkintl.h" -#include "gtkwin32themeprivate.h" #include "deprecated/gtkthemingengine.h" #include "deprecated/gtkgradient.h" diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c index 6cd36c8da7..cee8e27c26 100644 --- a/gtk/gtkcssstylepropertyimpl.c +++ b/gtk/gtkcssstylepropertyimpl.c @@ -61,7 +61,6 @@ #include "gtkcssstringvalueprivate.h" #include "gtkcsstransformvalueprivate.h" #include "gtktypebuiltins.h" -#include "gtkwin32themeprivate.h" #include "deprecated/gtkthemingengine.h" diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 7560fa9266..7c9a065661 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -56,10 +56,6 @@ #include "win32/gdkwin32.h" #endif -#ifdef G_OS_WIN32 -#include "gtkwin32themeprivate.h" -#endif - #include "deprecated/gtkrc.h" #ifdef GDK_WINDOWING_QUARTZ diff --git a/gtk/gtkwin32theme.c b/gtk/gtkwin32theme.c index 9b20a76f45..c868b25410 100644 --- a/gtk/gtkwin32theme.c +++ b/gtk/gtkwin32theme.c @@ -410,15 +410,3 @@ _gtk_win32_theme_color_resolve (const char *theme_class, return TRUE; } -const char * -_gtk_win32_theme_get_default (void) -{ -#ifdef G_OS_WIN32 - _gtk_win32_theme_init (); - - if (use_xp_theme) - return (os_version.dwMajorVersion >= 6) ? "gtk-win32" : "gtk-win32-xp"; -#endif - return "gtk-win32-classic"; -} - diff --git a/gtk/gtkwin32themeprivate.h b/gtk/gtkwin32themeprivate.h index aa64da5bcc..90fcac9ddc 100644 --- a/gtk/gtkwin32themeprivate.h +++ b/gtk/gtkwin32themeprivate.h @@ -53,7 +53,6 @@ int _gtk_win32_theme_int_parse (GtkCssParser *parser, gboolean _gtk_win32_theme_color_resolve (const char *theme_class, gint id, GdkRGBA *color); -const char * _gtk_win32_theme_get_default (void); G_END_DECLS -- 2.30.2